VTPM is off by default.

diff --git a/Config.mk b/Config.mk
index 06d569851cede6a126c5446404cb69cd2536038d..e5f53cbc16055e8dbad040d6e6eca8bf14816f75 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -48,3 +48,4 @@ ACM_USE_SECURITY_POLICY ?= ACM_NULL_POLICY
 # Optional components
 XENSTAT_XENTOP ?= y
 
+VTPM_TOOLS ?= n

diff --git a/linux-2.6-xen-sparse/arch/xen/Kconfig b/linux-2.6-xen-sparse/arch/xen/Kconfig
index e0c76d476a686a226e31ad841fe79ac65fdad280..b5088f87a8c6d80c071f0cec1f10747e5d3ab177 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/Kconfig
+++ b/linux-2.6-xen-sparse/arch/xen/Kconfig
@@ -72,7 +72,7 @@ config XEN_NETDEV_BACKEND
 
 config XEN_TPMDEV_FRONTEND
         bool "TPM-device frontend driver"
-        default y
+        default n
         help
           The TPM-device frontend driver.
 

diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
index 813ebf24ee61f28d9fb60dddc98446bd11244d23..a6c238b13464d8ec3590e0972ac73bbb5a02f23f 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
@@ -16,8 +16,7 @@ CONFIG_XEN_BLKDEV_BACKEND=y
 # CONFIG_XEN_BLKDEV_TAP_BE is not set
 CONFIG_XEN_NETDEV_BACKEND=y
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
-CONFIG_XEN_TPMDEV_BACKEND=y
-# CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_GRANT_TX=y
@@ -855,9 +854,7 @@ CONFIG_DRM_SIS=m
 #
 # TPM devices
 #
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_TPM is not set
 
 #
 # I2C support

diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
index a0aedc4e381301b65919ac58feb1226f881878f0..47d1ea9218f50893d8466526be2f3047422c1551 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
@@ -15,9 +15,8 @@ CONFIG_XEN_PHYSDEV_ACCESS=y
 CONFIG_XEN_BLKDEV_BACKEND=y
 # CONFIG_XEN_BLKDEV_TAP_BE is not set
 CONFIG_XEN_NETDEV_BACKEND=y
-# CONFIG_XEN_TPMDEV_BACKEND is not set
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
-# CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_GRANT_TX=y
@@ -762,9 +761,7 @@ CONFIG_DRM_SIS=m
 #
 # TPM devices
 #
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_TPM is not set
 
 #
 # I2C support

diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
index bc7bc1bbdf851059097ee2b878afd8ddb4a1acc0..492b6d6cea4251d1c8359306d1ec0da0d7d6cca3 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
@@ -12,7 +12,7 @@ CONFIG_NO_IDLE_HZ=y
 #
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 # CONFIG_XEN_PHYSDEV_ACCESS is not set
-CONFIG_XEN_TPMDEV_FRONTEND=y
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
 # CONFIG_XEN_TPMDEV_BACKEND is not set
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
@@ -338,8 +338,7 @@ CONFIG_NETDEVICES=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_TCG_TPM=y
-CONFIG_TCG_XEN=y
+# CONFIG_TCG_TPM is not set
 
 #
 # Character devices

diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64
index d3fff5d91b8f30fcc0173d74c6615c44bb3c1f9e..2e4ddbcba8facc772726763ac4c5d130c2380515 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64
@@ -664,8 +664,7 @@ CONFIG_NETCONSOLE=m
 CONFIG_INPUT=m
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-CONFIG_TCG_TPM=y
-CONFIG_TCG_XEN=y
+# CONFIG_TCG_TPM is not set
 
 #
 # Character devices

diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32
index c00ca74c40b88d892d95b9b8edaaf01557d24f29..56fa2258deaf9755c9ca439a87acd40afec22086 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32
@@ -15,11 +15,10 @@ CONFIG_XEN_PHYSDEV_ACCESS=y
 CONFIG_XEN_BLKDEV_BACKEND=y
 # CONFIG_XEN_BLKDEV_TAP_BE is not set
 CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_XEN_TPMDEV_BACKEND=y
-# CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_TPMDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_GRANT_TX=y
 CONFIG_XEN_NETDEV_GRANT_RX=y
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
@@ -1858,9 +1857,7 @@ CONFIG_HANGCHECK_TIMER=m
 #
 # TPM devices
 #
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_TPM is not set
 
 #
 # I2C support

diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64
index 9ec1066eedadf704b8ad6e8766bfc3e7be51769b..420365ef0b750e244ac1c8289ef63b03c48cce9b 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64
@@ -15,10 +15,10 @@ CONFIG_XEN_PHYSDEV_ACCESS=y
 CONFIG_XEN_BLKDEV_BACKEND=y
 # CONFIG_XEN_BLKDEV_TAP_BE is not set
 CONFIG_XEN_NETDEV_BACKEND=y
-# CONFIG_XEN_TPMEV_BACKEND is not set
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
-# CONFIG_XEN_TPMDEV_FRONTEND is not set
 CONFIG_XEN_NETDEV_GRANT_TX=y
 CONFIG_XEN_NETDEV_GRANT_RX=y
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set

diff --git a/tools/Makefile b/tools/Makefile
index 1ed976476dd43abc2647e053703a057d41dec919..d2ba0874ee6ab5052fbb92719ab82f54b2ba71ff 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -12,8 +12,10 @@ SUBDIRS += xcutils
 SUBDIRS += firmware
 SUBDIRS += security
 SUBDIRS += console
+ifeq ($(VTPM_TOOLS),y)
 SUBDIRS += vtpm_manager
 SUBDIRS += vtpm
+endif
 SUBDIRS += xenstat
 
 .PHONY: all install clean check check_clean ioemu eioemuinstall ioemuclean